Skip to content

OADP-4454: Fixing configuration error in Azure installation docs #78670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
stevsmit merged 1 commit into from
Sep 16, 2024
Merged

OADP-4454: Fixing configuration error in Azure installation docs #78670

stevsmit merged 1 commit into from
Sep 16, 2024

Conversation

@anarnold97
Copy link
Contributor

@anarnold97 anarnold97 commented Jul 9, 2024 •
edited
Loading

JIRA

I have reworked the logic for OADP to remove the Azure CLI commands

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change. Amos Mastbaum approved (LGTM in JIRA)

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 9, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 9, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 9, 2024
@anarnold97 anarnold97 closed this Jul 9, 2024
@anarnold97 anarnold97 reopened this Jul 9, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 9, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 9, 2024 •
edited
Loading

🤖 Fri Sep 13 13:42:12 - Prow CI generated the docs preview:

https://78670--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/installing/installing-oadp-azure.html
https://78670--ocpdocs-pr.netlify.app/openshift-enterprise/latest/migrating_from_ocp_3_to_4/installing-3-4.html
https://78670--ocpdocs-pr.netlify.app/openshift-enterprise/latest/migration_toolkit_for_containers/installing-mtc.html

anarnold97
anarnold97 commented Jul 9, 2024
View reviewed changes
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 9, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 9, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

Details

In response to this:

JIRA

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 9, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

Details

In response to this:

JIRA

I have used the Azure CLI docs to bring across the --scopes parameter.

I have included:

  • Subscription: /subscriptions/mySubscriptionID
  • Resource group: /subscriptions/mySubscriptionID/resourceGroups/myResourceGroupName

I presume this is correct but do not have an Azure instance to test.

I have changed these to lowercase Snake Case, although I think there is a good argument to keep them in MS formatting of Camel Case.

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@amastbau
Copy link

amastbau commented Aug 22, 2024

@anarnold97
seems like section 11 and 14 are duplicated
i think you only wnat to leave 14

@anarnold97
Copy link
Contributor Author

anarnold97 commented Aug 22, 2024

@anarnold97 seems like section 11 and 14 are duplicated i think you only wnat to leave 14

@amastbau - which is really weird as I only added section 9 and 10! LOL

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 22, 2024
@anarnold97
Copy link
Contributor Author

anarnold97 commented Aug 22, 2024

@amastbau - i think it is caused by a missing ifdef.

So if we change lines 117 to 134 and include an ifndef not to include installing-oadp-azure variable, which should pair with the ifdef to include installing-oadp-azure variable.

Please can you check again.

@anarnold97 anarnold97 closed this Aug 26, 2024
@anarnold97 anarnold97 reopened this Aug 26, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 26, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.

Details

In response to this:

JIRA

I have used the Azure CLI docs to bring across the --scopes parameter.

I have included:

  • Subscription: /subscriptions/mySubscriptionID
  • Resource group: /subscriptions/mySubscriptionID/resourceGroups/myResourceGroupName

I presume this is correct but do not have an Azure instance to test.

I have changed these to lowercase Snake Case, although I think there is a good argument to keep them in MS formatting of Camel Case.

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@anarnold97 anarnold97 closed this Aug 26, 2024
@anarnold97 anarnold97 reopened this Aug 26, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 26, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.

Details

In response to this:

JIRA

I have used the Azure CLI docs to bring across the --scopes parameter.

I have included:

  • Subscription: /subscriptions/mySubscriptionID
  • Resource group: /subscriptions/mySubscriptionID/resourceGroups/myResourceGroupName

I presume this is correct but do not have an Azure instance to test.

I have changed these to lowercase Snake Case, although I think there is a good argument to keep them in MS formatting of Camel Case.

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@anarnold97 anarnold97 closed this Aug 26, 2024
@anarnold97 anarnold97 reopened this Aug 26, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 26, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.

Details

In response to this:

JIRA

I have used the Azure CLI docs to bring across the --scopes parameter.

I have included:

  • Subscription: /subscriptions/mySubscriptionID
  • Resource group: /subscriptions/mySubscriptionID/resourceGroups/myResourceGroupName

I presume this is correct but do not have an Azure instance to test.

I have changed these to lowercase Snake Case, although I think there is a good argument to keep them in MS formatting of Camel Case.

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 5, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.

Details

In response to this:

JIRA

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 5, 2024 •
edited by openshift-ci bot
Loading

@anarnold97: This pull request references OADP-4454 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.18.0" version, but no target version was set.

Details

In response to this:

JIRA

I have reworked the logic for OADP to remove the Azure CLI commands

Versions

  • OCP 4.12 → branch/enterprise-4.12
  • OCP 4.13 → branch/enterprise-4.13
  • OCP 4.14 → branch/enterprise-4.14
  • OCP 4.15 → branch/enterprise-4.15
  • OCP 4.16 → branch/enterprise-4.16

Link to docs preview:

OADP preview:

MTC docs impacted:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@anarnold97
Copy link
Contributor Author

anarnold97 commented Sep 5, 2024

/label oadp

@openshift-ci openshift-ci bot added the OADP Label for all OADP PRs label Sep 5, 2024
@anarnold97 anarnold97 force-pushed the OADP-4454-Configuring-Azure branch from a8d5463 to f02c169 Compare September 13, 2024 13:32
@openshift-ci
Copy link

openshift-ci bot commented Sep 13, 2024

@anarnold97: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@anarnold97
Copy link
Contributor Author

anarnold97 commented Sep 16, 2024

squashed ready for merge review

@anarnold97
Copy link
Contributor Author

anarnold97 commented Sep 16, 2024

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 16, 2024
@stevsmit stevsmit added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Sep 16, 2024
@stevsmit stevsmit added this to the Continuous Release milestone Sep 16, 2024
stevsmit
stevsmit reviewed Sep 16, 2024
View reviewed changes
Copy link
Member

@stevsmit stevsmit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few smaller nits, like preceding all ocmmands with ". . . by entering the following command:", but nothing that should hold up a review. Good work.

modules/migration-configuring-azure.adoc
+
The CLI generates a password for you. Ensure you capture the password.

. After creating the service principal, obtain the client id.
Copy link
Member

@stevsmit stevsmit Sep 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
. After creating the service principal, obtain the client id.
. After creating the service principal, obtain the client id:

@stevsmit stevsmit merged commit 6f594a4 into openshift:main Sep 16, 2024
@stevsmit
Copy link
Member

stevsmit commented Sep 16, 2024

/cherry-pick enterprise-4.12

@stevsmit
Copy link
Member

stevsmit commented Sep 16, 2024

/cherry-pick enterprise-4.13

@stevsmit
Copy link
Member

stevsmit commented Sep 16, 2024

/cherry-pick enterprise-4.14

@stevsmit
Copy link
Member

stevsmit commented Sep 16, 2024

/cherry-pick enterprise-4.15

@stevsmit
Copy link
Member

stevsmit commented Sep 16, 2024

/cherry-pick enterprise-4.16

@stevsmit
Copy link
Member

stevsmit commented Sep 16, 2024

/cherry-pick enterprise-4.17

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 16, 2024

@stevsmit: #78670 failed to apply on top of branch "enterprise-4.12":

Applying: OADP-4454: Fixing configuration error in Azure installation docs
Using index info to reconstruct a base tree...
M	modules/migration-configuring-azure.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/migration-configuring-azure.adoc
CONFLICT (content): Merge conflict in modules/migration-configuring-azure.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OADP-4454: Fixing configuration error in Azure installation docs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick enterprise-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 16, 2024

@stevsmit: new pull request created: #81901

Details

In response to this:

/cherry-pick enterprise-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 16, 2024
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 16, 2024

@stevsmit: new pull request created: #81902

Details

In response to this:

/cherry-pick enterprise-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 16, 2024
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 16, 2024

@stevsmit: new pull request created: #81903

Details

In response to this:

/cherry-pick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 16, 2024
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 16, 2024

@stevsmit: new pull request created: #81904

Details

In response to this:

/cherry-pick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 16, 2024
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 16, 2024

@stevsmit: new pull request created: #81905

Details

In response to this:

/cherry-pick enterprise-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 16, 2024
Merged
@stevsmit
Copy link
Member

stevsmit commented Sep 16, 2024

/retest

@anarnold97 anarnold97 mentioned this pull request Sep 16, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sheriff-rh sheriff-rh sheriff-rh left review comments

@stevsmit stevsmit stevsmit left review comments

+1 more reviewer

@mail2nadeem92 mail2nadeem92 mail2nadeem92 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. merge-review-in-progress Signifies that the merge review team is reviewing this PR OADP Label for all OADP PRs size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.

8 participants

@anarnold97 @openshift-ci-robot @ocpdocs-previewbot @amastbau @stevsmit @openshift-cherrypick-robot @mail2nadeem92 @sheriff-rh